home *** CD-ROM | disk | FTP | other *** search
/ World of Video / World of Video.iso / gfxprograms / 3dprograms / rayshade-4.0 / fixes / fix024 / libshade / lex.l.diff next >
Text File  |  1995-02-13  |  2KB  |  68 lines
  1. *** lex.l    Mon Oct 11 14:59:56 1993
  2. --- lex.l.frac    Mon Oct 11 14:46:02 1993
  3. ***************
  4. *** 25,30 ****
  5. --- 25,33 ----
  6.   #include "libsurf/surface.h"
  7.   #include "libtext/texture.h"
  8.   #include "libobj/geom.h"
  9. + #include "libobj/ifs.h"
  10. + #include "libobj/mountain.h"
  11. + #include "libobj/fractalobject.h"
  12.   #include "symtab.h"
  13.   #include "y.tab.h"
  14.   extern char *strsave();
  15. ***************
  16. *** 35,43 ****
  17.   exp    [Ee][-+]?{digit}+
  18.   string    {alpha}({alpha}|{digit}|{special})*
  19.   filename "/"?"/"?(("."|".."|{string})"/")*{string}
  20. ! %p 9400
  21.   %e 1500
  22. ! %n 600
  23.   %%
  24.   [ \t\n]            ;
  25.   ^#            handlehash();
  26. --- 38,46 ----
  27.   exp    [Ee][-+]?{digit}+
  28.   string    {alpha}({alpha}|{digit}|{special})*
  29.   filename "/"?"/"?(("."|".."|{string})"/")*{string}
  30. ! %p 12000
  31.   %e 1500
  32. ! %n 700
  33.   %%
  34.   [ \t\n]            ;
  35.   ^#            handlehash();
  36. ***************
  37. *** 150,155 ****
  38. --- 153,171 ----
  39.   window            return tWINDOW;
  40.   windy            return tWINDY;
  41.   wood            return tWOOD;
  42. + normalweighting         return tNORMALWEIGHTING;
  43. + minsize                 return tMINSIZE;
  44. + lowpass                 return tLOWPASS;
  45. + highpass                return tHIGHPASS;
  46. + ifs            return tIFS;
  47. + constant                return tCONSTANT;
  48. + bounding                return tBOUNDING;
  49. + fpoints                 return tFPOINTS;
  50. + ftriangles              return tFTRIANGLES;
  51. + fentities               return tFENTITIES;
  52. + fentity                 return tENTITY;
  53. + fractalobject           return tFRACTALOBJECT;
  54. + mountain                return tMOUNTAIN;
  55.   {digit}+ |
  56.   {digit}+"."{digit}*({exp})? |
  57.   {digit}*"."{digit}+({exp})? |
  58. ***************
  59. *** 160,165 ****
  60. --- 176,182 ----
  61.   
  62.   %%
  63.   yywrap() {return 1;}
  64. + 
  65.   /*
  66.    * Skip over comments.
  67.    */
  68.